From 705441fca0a2ea4fadf9ef8b02525dea024e0408 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 11 Dec 2010 11:00:46 -0600 Subject: [PATCH] Fix the value for RIPEMD-160 in epg-digest-algorithm-alist. --- debian/changelog | 7 ++- .../fix-epg-digest-algorithm-alist.diff | 60 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-epg-digest-algorithm-alist.diff diff --git a/debian/changelog b/debian/changelog index 2b1c24bb80c..e6cce1430bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,12 @@ emacs23 (23.2+1-7) unstable; urgency=low Thanks to Courtney Bane for the report and the patch. (closes: #599463) - -- Rob Browning Sat, 11 Dec 2010 10:38:51 -0600 + * Fix the value for RIPEMD-160 in epg-digest-algorithm-alist + according to RFC 4880. Thanks to Daniel Kahn Gillmor + for the report and the fix. + (closes: #594510) + + -- Rob Browning Sat, 11 Dec 2010 11:00:07 -0600 emacs23 (23.2+1-6) unstable; urgency=low diff --git a/debian/patches/fix-epg-digest-algorithm-alist.diff b/debian/patches/fix-epg-digest-algorithm-alist.diff new file mode 100644 index 00000000000..36c80f9436e --- /dev/null +++ b/debian/patches/fix-epg-digest-algorithm-alist.diff @@ -0,0 +1,60 @@ +* The value for RIPEMD-160 in epg-digest-algorithm-alist has been fixed. + Patch: fix-epg-digest-algorithm-alist.diff + Provided-by: Daniel Kahn Gillmor + Date: Thu, 26 Aug 2010 14:09:01 UTC + Added-by: Rob Browning + Status: incorporated upstream + + The Debian patch is taken from this upstream commit: + + revno: 102553 + committer: Daiki Ueno + branch nick: trunk + timestamp: Fri 2010-12-03 10:52:43 +0900 + message: + Trivial fixes for epg.el. + + * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with + "RIPEMD160" (Bug#7490). Reported by Daniel Kahn Gillmor. + (epg-context-set-passphrase-callback): Mention that the callback + is not called when used with GnuPG 2.x. + +--- a/lisp/ChangeLog ++++ b/lisp/ChangeLog +@@ -1,3 +1,10 @@ ++2010-12-03 Daiki Ueno ++ ++ * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with ++ "RIPEMD160" (Bug#7490). Reported by Daniel Kahn Gillmor. ++ (epg-context-set-passphrase-callback): Mention that the callback ++ is not called when used with GnuPG 2.x. ++ + 2010-05-07 Chong Yidong + + * Version 23.2 released. +--- a/lisp/epg.el ++++ b/lisp/epg.el +@@ -66,7 +66,7 @@ + (defconst epg-digest-algorithm-alist + '((1 . "MD5") + (2 . "SHA1") +- (3 . "RMD160") ++ (3 . "RIPEMD160") + (8 . "SHA256") + (9 . "SHA384") + (10 . "SHA512") +@@ -335,7 +335,13 @@ + car is a function and cdr is a callback data. + + The function gets three arguments: the context, the key-id in +-question, and the callback data (if any)." ++question, and the callback data (if any). ++ ++The callback may not be called if you use GnuPG 2.x, which relies ++on the external program called `gpg-agent' for passphrase query. ++If you really want to intercept passphrase query, consider ++installing GnuPG 1.x _along with_ GnuPG 2.x, which does passphrase ++query by itself and Emacs can intercept them." + (unless (eq (car-safe context) 'epg-context) + (signal 'wrong-type-argument (list 'epg-context-p context))) + (aset (cdr context) 7 (if (consp passphrase-callback) diff --git a/debian/patches/series b/debian/patches/series index 054b55a530b..e1754377a07 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,3 +15,4 @@ use-safe-alloca-lisp-in-let-eval-apply-apply_lambda.diff fix-gnus-output-to-mail-with-live-rmail-buffers.diff fix-fc-dual-font-width-calculation.diff do-not-initialize-terminal-twice.diff +fix-epg-digest-algorithm-alist.diff -- 2.30.2